From: Christian Marangi <ansuelsmth@gmail.com>
Date: Wed, 5 Nov 2025 21:05:14 +0000 (+0100)
Subject: sofia-sip: backport patch fixing support for GCC 14
X-Git-Url: http://git.openwrt.org/%22https:/collectd.org//%22/%22https:/collectd.org/%22?a=commitdiff_plain;h=e8322b22d6743a148dc69d1cbb5ca254e3966c7b;p=feed%2Ftelephony.git

sofia-sip: backport patch fixing support for GCC 14

Backport patch fixing support for GCC 14. While at it also renumber the
other patch with 1xx order to follow usual pattern for downstream patch.

Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
---

diff --git a/libs/sofia-sip/patches/001-Fix-incompatible-pointer-type-in-sip_basic.c-249.patch b/libs/sofia-sip/patches/001-Fix-incompatible-pointer-type-in-sip_basic.c-249.patch
new file mode 100644
index 0000000..106c416
--- /dev/null
+++ b/libs/sofia-sip/patches/001-Fix-incompatible-pointer-type-in-sip_basic.c-249.patch
@@ -0,0 +1,21 @@
+From 43f41d153f8034288083a440b1569d63f431f1b9 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Tomi=20L=C3=A4hteenm=C3=A4ki?= <lihis@lihis.net>
+Date: Tue, 10 Jun 2025 23:49:48 +0300
+Subject: [PATCH] Fix incompatible pointer type in sip_basic.c (#249)
+
+Closes #248
+---
+ libsofia-sip-ua/sip/sip_basic.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/libsofia-sip-ua/sip/sip_basic.c
++++ b/libsofia-sip-ua/sip/sip_basic.c
+@@ -2901,7 +2901,7 @@ issize_t sip_identity_d(su_home_t *home,
+       ext = strchr(ppt, ';');
+ 
+       if (ext) {
+-          msg_param_t *params = su_alloc(home, sizeof(msg_param_t));
++          msg_param_t const *params = su_alloc(home, sizeof(msg_param_t));
+           if (msg_params_d(home, &ext, &params) >= 0) {
+               id->id_info_params = params;
+           }
diff --git a/libs/sofia-sip/patches/01-disable-libcheck.patch b/libs/sofia-sip/patches/01-disable-libcheck.patch
deleted file mode 100644
index 3d1c04b..0000000
--- a/libs/sofia-sip/patches/01-disable-libcheck.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -247,7 +247,7 @@ SAC_OPENSSL
- SAC_TPORT
- 
- dnl Check is used for testing
--PKG_CHECK_MODULES(CHECK, check >= 0.9.4, have_check="yes", have_check="no")
-+PKG_CHECK_MODULES(CHECK, we_do_not_want_check >= 0.9.4, have_check="yes", have_check="no")
- AM_CONDITIONAL(HAVE_CHECK, test x"$have_check" = "xyes")
- if test x"$have_check" = "xyes"; then
-    AC_DEFINE([HAVE_CHECK], 1, [Define to 1 if check library is available])
diff --git a/libs/sofia-sip/patches/100-disable-libcheck.patch b/libs/sofia-sip/patches/100-disable-libcheck.patch
new file mode 100644
index 0000000..3d1c04b
--- /dev/null
+++ b/libs/sofia-sip/patches/100-disable-libcheck.patch
@@ -0,0 +1,11 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -247,7 +247,7 @@ SAC_OPENSSL
+ SAC_TPORT
+ 
+ dnl Check is used for testing
+-PKG_CHECK_MODULES(CHECK, check >= 0.9.4, have_check="yes", have_check="no")
++PKG_CHECK_MODULES(CHECK, we_do_not_want_check >= 0.9.4, have_check="yes", have_check="no")
+ AM_CONDITIONAL(HAVE_CHECK, test x"$have_check" = "xyes")
+ if test x"$have_check" = "xyes"; then
+    AC_DEFINE([HAVE_CHECK], 1, [Define to 1 if check library is available])